TeX 1995 July

home *** CD-ROM | disk | FTP | other *** search

/ TeX 1995 July / TeX CD-ROM July 1995 (Disc 1)(Walnut Creek)(1995).ISO / tex-k / tex-k-archive.past / tex-k-archive.gz / tex-k-archive / 000451_bruno@alpha1.csd.uwm.edu_Sat Apr 2 08:03:07 1994.msg < prev next >

Wrap

Internet Message Format | 1994-10-11 | 87KB

Received: from alpha1.csd.uwm.edu by cs.umb.edu with SMTP id AA26480 (5.65c/IDA-1.4.4 for <tex-k@cs.umb.edu>); Sat, 2 Apr 1994 15:03:53 -0500 Received: (bruno@localhost) by alpha1.csd.uwm.edu (8.6.7/8.6.8) id OAA04614 for tex-k@cs.umb.edu; Sat, 2 Apr 1994 14:03:07 -0600 Date: Sat, 2 Apr 1994 14:03:07 -0600 From: Bruno Wolff III <bruno@alpha1.csd.uwm.edu> Message-Id: <199404022003.OAA04614@alpha1.csd.uwm.edu> To: tex-k@cs.umb.edu Subject: more on dviljk There is a mistake in the PJL LANGUAGE command. On our 4si this ends up with the print job being ignored. The alpha change also required more than just setting long to be int. That did seem to work in my test cases for the LJ and LJ2P drivers, but not always for the LJ4 driver. The problem is that there are scanf and printf format codes that specifiy long words. What I ended up doing is changing most longs to long4 which is a macro for either long or int. This left "long" still available to properly type cast stuff. I left some external functions and scanf'd variables as long. I am not really sure I did this completely right, but dvilj, dvilj2p and dvilj4 seem to be working OK on our alpha under OSF using gcc. I have included context diffs for the stuff I have changed. *** Makefile.in.orig Thu Mar 3 12:55:44 1994 --- Makefile.in Fri Apr 1 17:26:07 1994 *************** *** 18,24 **** scriptdir = $(bindir) libdir = $(exec_prefix)/lib datadir = $(prefix)/lib ! infodir = $(prefix)/info includedir = $(prefix)/include manext = 1 mandir = $(prefix)/man/man$(manext) --- 18,24 ---- scriptdir = $(bindir) libdir = $(exec_prefix)/lib datadir = $(prefix)/lib ! infodir = $(prefix)/gnu/info includedir = $(prefix)/include manext = 1 mandir = $(prefix)/man/man$(manext) *************** *** 82,88 **** # End of installation directory definitions. # See INSTALL for compilation options. ! DEFS = -DLJ4 $(XDEFS) CC = @CC@ # CFLAGS is used for both compilation and linking. --- 82,88 ---- # End of installation directory definitions. # See INSTALL for compilation options. ! DEFS = $(XDEFS) -DMAKETEXPK_BY_DEFAULT -DMFMODE=\"\" CC = @CC@ # CFLAGS is used for both compilation and linking. *************** *** 117,123 **** srcdir = @srcdir@ VPATH = @srcdir@ ! objects = dvi2xx.o tfm.o makeargs = $(MFLAGS) SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' $(MAKEARGS) installargs = INSTALL='$(INSTALL)' INSTALL_DATA='$(INSTALL_DATA)' \ --- 117,125 ---- srcdir = @srcdir@ VPATH = @srcdir@ ! objects = dvi2lj.o tfm.o ! objects2p = dvi2lj2p.o tfm.o ! objects4 = dvi2lj4.o tfm.o makeargs = $(MFLAGS) SHELL='$(SHELL)' CC='$(CC)' CFLAGS='$(CFLAGS)' $(MAKEARGS) installargs = INSTALL='$(INSTALL)' INSTALL_DATA='$(INSTALL_DATA)' \ *************** *** 125,136 **** bh_fontdir=$(bh_fontdir) cg_fontdir=$(cg_fontdir) mt_fontdir=$(mt_fontdir) program = dvilj ! all: $(program) $(program): $(objects) $(kpathsea) $(CC) $(LDFLAGS) -o $(program) $(objects) $(LOADLIBES) $(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h cd $(kpathsea_dir); $(MAKE) $(makeargs) --- 127,155 ---- bh_fontdir=$(bh_fontdir) cg_fontdir=$(cg_fontdir) mt_fontdir=$(mt_fontdir) program = dvilj + program2p = dvilj2p + program4 = dvilj4 ! all: $(program) $(program2p) $(program4) $(program): $(objects) $(kpathsea) $(CC) $(LDFLAGS) -o $(program) $(objects) $(LOADLIBES) + $(program2p): $(objects2p) $(kpathsea) + $(CC) $(LDFLAGS) -o $(program2p) $(objects2p) $(LOADLIBES) + + $(program4): $(objects4) $(kpathsea) + $(CC) $(LDFLAGS) -o $(program4) $(objects4) $(LOADLIBES) + + dvi2lj.o: dvi2xx.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ -c dvi2xx.c -o dvi2lj.o + + dvi2lj2p.o: dvi2xx.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ2P -c dvi2xx.c -o dvi2lj2p.o + + dvi2lj4.o: dvi2xx.c + $(CC) $(CPPFLAGS) $(CFLAGS) -DLJ4 -c dvi2xx.c -o dvi2lj4.o + $(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h cd $(kpathsea_dir); $(MAKE) $(makeargs) *************** *** 138,148 **** install: install-exec install-data uninstall: uninstall-exec uninstall-data ! install-exec: $(program) $(SHELL) $(srcdir)/../mkdirchain $(bindir) $(INSTALL_PROGRAM) $(program) $(bindir)/$(program) uninstall-exec: rm -f $(bindir)/$(program) install-data: # Man page. --- 157,171 ---- install: install-exec install-data uninstall: uninstall-exec uninstall-data ! install-exec: $(program) $(program2p) $(program4) $(SHELL) $(srcdir)/../mkdirchain $(bindir) $(INSTALL_PROGRAM) $(program) $(bindir)/$(program) + $(INSTALL_PROGRAM) $(program2p) $(bindir)/$(program2p) + $(INSTALL_PROGRAM) $(program4) $(bindir)/$(program4) uninstall-exec: rm -f $(bindir)/$(program) + rm -f $(bindir)/$(program2p) + rm -f $(bindir)/$(program4) install-data: # Man page. *************** *** 241,247 **** mostlyclean:: ! rm -f *.o $(program) $(lib) $(programs) clean:: mostlyclean rm -f *.dvi *.lj --- 264,270 ---- mostlyclean:: ! rm -f *.o $(program) $(program2p) $(program4) $(lib) $(programs) clean:: mostlyclean rm -f *.dvi *.lj *************** *** 280,286 **** -e 's,/usr[^ ]* ,,g' \ | uniq \ >depend.make ! dvi2xx.o : dvi2xx.c config.h $(kpathsea_dir)/config.h ./c-auto.h $(kpathsea_dir)/c-std.h \ $(kpathsea_dir)/c-unistd.h \ $(kpathsea_dir)/systypes.h \ $(kpathsea_dir)/c-memstr.h \ --- 303,309 ---- -e 's,/usr[^ ]* ,,g' \ | uniq \ >depend.make ! dvi2lj.o dvi2lj2p.o dvi2lj4 : dvi2xx.c config.h $(kpathsea_dir)/config.h ./c-auto.h $(kpathsea_dir)/c-std.h \ $(kpathsea_dir)/c-unistd.h \ $(kpathsea_dir)/systypes.h \ $(kpathsea_dir)/c-memstr.h \ *** config.h.orig Thu Mar 3 11:20:38 1994 --- config.h Sat Apr 2 11:12:13 1994 *************** *** 91,98 **** #define ARITHMETIC_RIGHT_SHIFT #endif ! #ifdef alpha ! #define long int #endif bool findfile(); --- 91,100 ---- #define ARITHMETIC_RIGHT_SHIFT #endif ! #ifdef LONG_64_BITS ! #define long4 int ! #else ! #define long4 long #endif bool findfile(); *************** *** 203,207 **** /* TFM files can always have 256 characters, even if we're using the old pixel format that only supports 128. The values are fix-words scaled by the design size; i.e., straight from the TFM file. */ ! long widths[256]; } tfm_info_type; --- 205,209 ---- /* TFM files can always have 256 characters, even if we're using the old pixel format that only supports 128. The values are fix-words scaled by the design size; i.e., straight from the TFM file. */ ! long4 widths[256]; } tfm_info_type; *** configure.in.orig Thu Feb 24 14:22:59 1994 --- configure.in Fri Apr 1 23:11:54 1994 *************** *** 2,6 **** --- 2,7 ---- AC_INIT(dvi2xx.c) sinclude(../kpathsea/common.ac) + AC_LONG_64_BITS AC_OUTPUT(Makefile fonts/Makefile) *** configure.orig Fri Feb 25 13:16:06 1994 --- configure Fri Apr 1 23:11:59 1994 *************** *** 244,250 **** test -n "$RANLIB" && test -n "$verbose" && echo " setting RANLIB to $RANLIB" - echo checking for POSIXized ISC if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 --- 244,249 ---- *************** *** 656,661 **** --- 655,683 ---- extrasub='/^[ ]*VPATH[ ]*=[ ]*/d' fi + + echo checking for 64-bit long ints + cat > conftest.c <<EOF + #include "confdefs.h" + main() { exit(sizeof(long int) != 8); } + EOF + eval $compile + if test -s conftest && (./conftest; exit) 2>/dev/null; then + + { + test -n "$verbose" && \ + echo " defining LONG_64_BITS" + echo "#define" LONG_64_BITS 1 >> confdefs.h + DEFS="$DEFS -DLONG_64_BITS=1" + SEDDEFS="${SEDDEFS}\${SEDdA}LONG_64_BITS\${SEDdB}LONG_64_BITS\${SEDdC}1\${SEDdD} + \${SEDuA}LONG_64_BITS\${SEDuB}LONG_64_BITS\${SEDuC}1\${SEDuD} + \${SEDeA}LONG_64_BITS\${SEDeB}LONG_64_BITS\${SEDeC}1\${SEDeD} + " + } + + + fi + rm -fr conftest* # Set default prefixes. *** dvi2xx.c.orig Thu Mar 3 12:56:17 1994 --- dvi2xx.c Sat Apr 2 13:48:34 1994 *************** *** 132,139 **** #define NEW(A) ((A *) malloc(sizeof(A))) #define EQ(a,b) (strcmp(a,b)==0) #define MM_TO_PXL(x) (int)(((x)*RESOLUTION*10)/254) ! #define PT_TO_PXL(x) (int)((long)((x)*RESOLUTION*100l)/7224) ! #define PT_TO_DVI(x) (long)((x)*65536l) #define BOPENCMD fopen #define BINOPEN(f) BOPENCMD(f,READ_BINARY) /* SMALL_SIZE characters are loaded into font storage of the printer */ --- 132,139 ---- #define NEW(A) ((A *) malloc(sizeof(A))) #define EQ(a,b) (strcmp(a,b)==0) #define MM_TO_PXL(x) (int)(((x)*RESOLUTION*10)/254) ! #define PT_TO_PXL(x) (int)((long4)((x)*RESOLUTION*100l)/7224) ! #define PT_TO_DVI(x) (long4)((x)*65536l) #define BOPENCMD fopen #define BINOPEN(f) BOPENCMD(f,READ_BINARY) /* SMALL_SIZE characters are loaded into font storage of the printer */ *************** *** 165,172 **** #endif #define EMITWORD(w) PUTWORD((w)) /* output a 2 byte word of data */ ! #define MoveOver(b) h += (long) b ! #define MoveDown(a) v += (long) a #define qfprintf if (!G_quiet) fprintf #define qprintf if (!G_quiet) printf #define LARGER(a,b) (((a)>(b)) ? (a) : (b)) --- 165,172 ---- #endif #define EMITWORD(w) PUTWORD((w)) /* output a 2 byte word of data */ ! #define MoveOver(b) h += (long4) b ! #define MoveDown(a) v += (long4) a #define qfprintf if (!G_quiet) fprintf #define qprintf if (!G_quiet) printf #define LARGER(a,b) (((a)>(b)) ? (a) : (b)) *************** *** 174,180 **** #ifdef IBM3812 #define PRINTER "IBM 3812 pageprinter" #define EMITC(c) PMPoutC(c) /* output a single character */ ! #define PMPcont(l) PMPout(-1,(long)l) /* next l bytes continuous */ #define PMPflush PMPout(0l,"") /* flush PMP-buffer */ #define EMITL(l,d) PMPout((int)l,d) /* EMIT-logical: via PMP-buffer */ #define hconvRESOLUTION 240 --- 174,180 ---- #ifdef IBM3812 #define PRINTER "IBM 3812 pageprinter" #define EMITC(c) PMPoutC(c) /* output a single character */ ! #define PMPcont(l) PMPout(-1,(char *)l) /* next l bytes continuous */ #define PMPflush PMPout(0l,"") /* flush PMP-buffer */ #define EMITL(l,d) PMPout((int)l,d) /* EMIT-logical: via PMP-buffer */ #define hconvRESOLUTION 240 *************** *** 234,241 **** #define MAXFONTSTORAGE (395l*1024l) /* standard user memory */ #define EMITC(c) putc(c,outfp) /* output a single character */ #define EMITL(l,d) EMITB(l,d) /* EMIT-logical = EMITB */ ! #define XDEFAULTOFF RESOLUTION-54 /*x default offset on page 1 inch (LJ2)*/ ! #define YDEFAULTOFF RESOLUTION+9 /* y default offset on page 1 inch */ #define max(x,y) if ((y)>(x)) x = y #ifndef vms #define INT_ASCII(b,i) if (i == 0) b[0] = '\0'; else sprintf((char *)b,"%hd",i) --- 234,241 ---- #define MAXFONTSTORAGE (395l*1024l) /* standard user memory */ #define EMITC(c) putc(c,outfp) /* output a single character */ #define EMITL(l,d) EMITB(l,d) /* EMIT-logical = EMITB */ ! #define XDEFAULTOFF (RESOLUTION-54*RESOLUTION/300) /*x default offset on page 1 inch (LJ2)*/ ! #define YDEFAULTOFF (RESOLUTION+9*RESOLUTION/300) /* y default offset on page 1 inch */ #define max(x,y) if ((y)>(x)) x = y #ifndef vms #define INT_ASCII(b,i) if (i == 0) b[0] = '\0'; else sprintf((char *)b,"%hd",i) *************** *** 303,309 **** /* interface to gf.c */ extern FILE *gfin; extern int checksum; ! extern long tfm_wd[], char_pointer[]; extern char char_exists[]; extern int num_cols, num_rows, num_bytes, x_offset, y_offset; extern unsigned char bits[]; --- 303,309 ---- /* interface to gf.c */ extern FILE *gfin; extern int checksum; ! extern long4 tfm_wd[], char_pointer[]; extern char char_exists[]; extern int num_cols, num_rows, num_bytes, x_offset, y_offset; extern unsigned char bits[]; *************** *** 332,338 **** void CopyHPFile(); void DecodeArgs(); void DoBop(); ! long DoConv(); void DoSpecial(); void EmitChar(); void Fatal(); --- 332,338 ---- void CopyHPFile(); void DecodeArgs(); void DoBop(); ! long4 DoConv(); void DoSpecial(); void EmitChar(); void Fatal(); *************** *** 345,354 **** bool IsSame(); void lcase(); void LoadAChar(); ! long NoSignExtend(); /* see cautionary note in code, re arithmetic vs logical shifts */ void OpenFontFile(); ! long PixRound(); void PkRaster(); void PutWord(); void RasterLine(); --- 345,354 ---- bool IsSame(); void lcase(); void LoadAChar(); ! long4 NoSignExtend(); /* see cautionary note in code, re arithmetic vs logical shifts */ void OpenFontFile(); ! long4 PixRound(); void PkRaster(); void PutWord(); void RasterLine(); *************** *** 360,366 **** void SetPosn(); void SetRule(); void SetString(); ! long SignExtend(); /* see cautionary note in code, re arithmetic vs logical shifts */ void SkipFontDef(); void Warning(); --- 360,366 ---- void SetPosn(); void SetRule(); void SetString(); ! long4 SignExtend(); /* see cautionary note in code, re arithmetic vs logical shifts */ void SkipFontDef(); void Warning(); *************** *** 383,408 **** struct { bool isloaded; union { ! long fileOffset; ! long *pixptr; } address; } where; ! long tfmw; /* TFM width */ ! long cw; /* character width in pixels */ unsigned char flag_byte; /* for PK-files */ unsigned char charsize; }; struct font_entry { /* font entry */ ! long k, c, s, d; int a, l; char n[STRSIZE]; /* FNT_DEF command parameters */ ! long font_mag; /* computed from FNT_DEF s and d parameters */ /*char psname[STRSIZE];*/ /* PostScript name of the font */ char name[STRSIZE]; /* full name of PXL file */ FILE * font_file_id; /* file identifier (NO_FILE if none) */ #ifdef USEPXL ! long magnification; /* magnification read from PXL file */ ! long designsize; /* design size read from PXL file */ #endif struct char_entry ch[NFNTCHARS]; /* character information */ struct font_entry *next; --- 383,408 ---- struct { bool isloaded; union { ! long4 fileOffset; ! long4 *pixptr; } address; } where; ! long4 tfmw; /* TFM width */ ! long4 cw; /* character width in pixels */ unsigned char flag_byte; /* for PK-files */ unsigned char charsize; }; struct font_entry { /* font entry */ ! long4 k, c, s, d; int a, l; char n[STRSIZE]; /* FNT_DEF command parameters */ ! long4 font_mag; /* computed from FNT_DEF s and d parameters */ /*char psname[STRSIZE];*/ /* PostScript name of the font */ char name[STRSIZE]; /* full name of PXL file */ FILE * font_file_id; /* file identifier (NO_FILE if none) */ #ifdef USEPXL ! long4 magnification; /* magnification read from PXL file */ ! long4 designsize; /* design size read from PXL file */ #endif struct char_entry ch[NFNTCHARS]; /* character information */ struct font_entry *next; *************** *** 479,485 **** #ifndef vms short G_errenc = 0; /* has an error been encountered? */ #else ! long G_errenc = SS$_NORMAL; /* has an error been encountered? */ #endif bool G_header = FALSE; /* copy header file to output? */ bool G_quiet = FALSE; /* for quiet operation */ --- 479,485 ---- #ifndef vms short G_errenc = 0; /* has an error been encountered? */ #else ! long4 G_errenc = SS$_NORMAL; /* has an error been encountered? */ #endif bool G_header = FALSE; /* copy header file to output? */ bool G_quiet = FALSE; /* for quiet operation */ *************** *** 490,503 **** short x_goffset; /* global x-offset in dots */ short y_goffset; /* global y-offset in dots */ unsigned short ncopies = 1; /* number of copies to print */ ! long hconv, vconv; /* converts DVI units to pixels */ ! long den; /* denominator specified in preamble */ ! long num; /* numerator specified in preamble */ ! long h; /* current horizontal position */ ! long hh = 0; /* current h on device */ ! long v; /* current vertical position */ ! long vv = 0; /* current v on device */ ! long mag; /* magnification specified in preamble */ long usermag = 0; /* user specified magnification */ int ndone = 0; /* number of pages converted */ int nopen = 0; /* number of open PXL files */ --- 490,503 ---- short x_goffset; /* global x-offset in dots */ short y_goffset; /* global y-offset in dots */ unsigned short ncopies = 1; /* number of copies to print */ ! long4 hconv, vconv; /* converts DVI units to pixels */ ! long4 den; /* denominator specified in preamble */ ! long4 num; /* numerator specified in preamble */ ! long4 h; /* current horizontal position */ ! long4 hh = 0; /* current h on device */ ! long4 v; /* current vertical position */ ! long4 vv = 0; /* current v on device */ ! long4 mag; /* magnification specified in preamble */ long usermag = 0; /* user specified magnification */ int ndone = 0; /* number of pages converted */ int nopen = 0; /* number of open PXL files */ *************** *** 512,531 **** struct font_entry *hfontptr = NULL; /* font_entry pointer */ struct font_entry *pfontptr = NULL; /* previous font_entry pointer */ struct pixel_list pixel_files[MAXOPEN+1]; /* list of open PXL files */ ! long postambleptr; /* Pointer to the postamble */ ! long ppagep; /* previous page pointer */ static int last_ry = UNKNOWN; /* last y-position on page */ static int last_rx = UNKNOWN; /* last x-position on page */ ! long StartPrintPages; /* notpad for double paged output */ int WouldPrint = 0; bool ZeroPage = FALSE; /* Document starts with a Zero Page */ bool EvenPage = FALSE; /* Document starts with an even Page */ ! long LastPtobePrinted = 0; int G_ncdl = 0; ! long allocated_storage = 0; /* size of mallocated storage (statistics) */ ! long power[32] ; ! long gpower[33] ; #ifdef DEBUG --- 512,531 ---- struct font_entry *hfontptr = NULL; /* font_entry pointer */ struct font_entry *pfontptr = NULL; /* previous font_entry pointer */ struct pixel_list pixel_files[MAXOPEN+1]; /* list of open PXL files */ ! long4 postambleptr; /* Pointer to the postamble */ ! long4 ppagep; /* previous page pointer */ static int last_ry = UNKNOWN; /* last y-position on page */ static int last_rx = UNKNOWN; /* last x-position on page */ ! long4 StartPrintPages; /* notpad for double paged output */ int WouldPrint = 0; bool ZeroPage = FALSE; /* Document starts with a Zero Page */ bool EvenPage = FALSE; /* Document starts with an even Page */ ! long4 LastPtobePrinted = 0; int G_ncdl = 0; ! long4 allocated_storage = 0; /* size of mallocated storage (statistics) */ ! long4 power[32] ; ! long4 gpower[33] ; #ifdef DEBUG *************** *** 541,547 **** #endif #endif ! long used_fontstorage = 0; #ifdef IBM3812 char PMPformat[20]; --- 541,547 ---- #endif #endif ! long4 used_fontstorage = 0; #ifdef IBM3812 char PMPformat[20]; *************** *** 583,593 **** char *argv[]; { struct stack_entry { /* stack entry */ ! long h, v, w, x, y, z; /* what's on stack */ }; short command; /* current command */ ! long count[10]; /* the 10 counters at begining of each page*/ ! long cpagep = 0; /* current page pointer */ bool Emitting = FALSE; /* outputting typsetting instructions? */ int i; /* command parameter; loop index */ int k; /* temporary parameter */ --- 583,593 ---- char *argv[]; { struct stack_entry { /* stack entry */ ! long4 h, v, w, x, y, z; /* what's on stack */ }; short command; /* current command */ ! long4 count[10]; /* the 10 counters at begining of each page*/ ! long4 cpagep = 0; /* current page pointer */ bool Emitting = FALSE; /* outputting typsetting instructions? */ int i; /* command parameter; loop index */ int k; /* temporary parameter */ *************** *** 597,607 **** int sp = 0; /* stack pointer */ struct stack_entry stack[STACK_SIZE]; /* stack */ char SpecialStr[STRSIZE]; /* "\special" strings */ ! long val, val2; /* temporarys to hold command information */ ! long w = 0; /* current horizontal spacing */ ! long x = 0; /* current horizontal spacing */ ! long y = 0; /* current vertical spacing */ ! long z = 0; /* current vertical spacing */ #ifdef vms --- 597,607 ---- int sp = 0; /* stack pointer */ struct stack_entry stack[STACK_SIZE]; /* stack */ char SpecialStr[STRSIZE]; /* "\special" strings */ ! long4 val, val2; /* temporarys to hold command information */ ! long4 w = 0; /* current horizontal spacing */ ! long4 x = 0; /* current horizontal spacing */ ! long4 y = 0; /* current vertical spacing */ ! long4 z = 0; /* current vertical spacing */ #ifdef vms *************** *** 695,701 **** #ifdef LJ4 EMIT(outfp, "\033%%-12345X@PJL SET RESOLUTION=600\012"); EMIT(outfp, "@PJL SET PAGEPROTECT=OFF\012"); ! EMIT(outfp, "@PJL SET ENTER LANGUAGE=PCL\012"); EMIT(outfp, "\033&u600D\033*t600R"); if (econoMode) EMIT(outfp, "\033*v1T"); --- 695,701 ---- #ifdef LJ4 EMIT(outfp, "\033%%-12345X@PJL SET RESOLUTION=600\012"); EMIT(outfp, "@PJL SET PAGEPROTECT=OFF\012"); ! EMIT(outfp, "@PJL ENTER LANGUAGE=PCL\012"); EMIT(outfp, "\033&u600D\033*t600R"); if (econoMode) EMIT(outfp, "\033*v1T"); *************** *** 853,859 **** */ if ( !SkipMode ) { if ( PassNo == 0) ! qfprintf(stderr, "[%ld", count[0]); } break; case EOP: --- 853,859 ---- */ if ( !SkipMode ) { if ( PassNo == 0) ! qfprintf(stderr, "[%ld", (long)count[0]); } break; case EOP: *************** *** 1024,1030 **** default: if (command >= FONT_00 && command <= FONT_63) { if (!SkipMode) ! SetFntNum((long) command - FONT_00, Emitting); } else if (command >= SETC_000 && command <= SETC_127) { if (!SkipMode) { SetString(command, PassNo); --- 1024,1030 ---- default: if (command >= FONT_00 && command <= FONT_63) { if (!SkipMode) ! SetFntNum((long4) command - FONT_00, Emitting); } else if (command >= SETC_000 && command <= SETC_127) { if (!SkipMode) { SetString(command, PassNo); *************** *** 1043,1049 **** /**********************************************************************/ double /* compute the actual size factor given the approximation */ ActualFactor(unmodsize) ! long unmodsize; /* actually factor * 1000 */ { double realsize; /* the actual magnification factor */ realsize = (double)unmodsize / 1000.0; --- 1043,1049 ---- /**********************************************************************/ double /* compute the actual size factor given the approximation */ ActualFactor(unmodsize) ! long4 unmodsize; /* actually factor * 1000 */ { double realsize; /* the actual magnification factor */ realsize = (double)unmodsize / 1000.0; *************** *** 1154,1169 **** if (used_fontstorage > MAXFONTSTORAGE) { Warning("\n\7used font_storage of %s: %ld Bytes (of %ld)\7", ! PRINTER, used_fontstorage, MAXFONTSTORAGE); Warning("Try to format file in separate runs!"); } else qfprintf(stderr, "\nAll done, used font_storage of %s: %ld Bytes (of %ld)", ! PRINTER, used_fontstorage, MAXFONTSTORAGE); #endif #ifdef LJ qfprintf(stderr, "\nAll done, used font_storage of %s: %ld Bytes", ! PRINTER, used_fontstorage); #ifdef LJ_RESIDENT_FONTS qfprintf(stderr, " + %d resident font%s", resident_count, resident_count == 1 ? "" : "s"); --- 1154,1169 ---- if (used_fontstorage > MAXFONTSTORAGE) { Warning("\n\7used font_storage of %s: %ld Bytes (of %ld)\7", ! PRINTER, (long)used_fontstorage, (long)MAXFONTSTORAGE); Warning("Try to format file in separate runs!"); } else qfprintf(stderr, "\nAll done, used font_storage of %s: %ld Bytes (of %ld)", ! PRINTER, (long)used_fontstorage, (long)MAXFONTSTORAGE); #endif #ifdef LJ qfprintf(stderr, "\nAll done, used font_storage of %s: %ld Bytes", ! PRINTER, (long)used_fontstorage); #ifdef LJ_RESIDENT_FONTS qfprintf(stderr, " + %d resident font%s", resident_count, resident_count == 1 ? "" : "s"); *************** *** 1182,1188 **** if (!G_quiet) { fprintf(stderr,"\nDynamically allocated storage: %ld Bytes \n", ! allocated_storage); fprintf(stderr,"%d characters downloaded as soft fonts\n", G_ncdl); #ifdef TIMING --- 1182,1188 ---- if (!G_quiet) { fprintf(stderr,"\nDynamically allocated storage: %ld Bytes \n", ! (long)allocated_storage); fprintf(stderr,"%d characters downloaded as soft fonts\n", G_ncdl); #ifdef TIMING *************** *** 1877,1885 **** /*********************************************************************/ /******************************** DoConv ***************************/ /*********************************************************************/ ! long DoConv(num, den, convResolution) ! long num, den; int convResolution; { /*register*/ double conv; --- 1877,1885 ---- /*********************************************************************/ /******************************** DoConv ***************************/ /*********************************************************************/ ! long4 DoConv(num, den, convResolution) ! long4 num, den; int convResolution; { /*register*/ double conv; *************** *** 1887,1893 **** ((double)mag / 1000.0) * ((double)convResolution/254000.0); ! return((long) ((1.0/conv)+0.5)); } --- 1887,1893 ---- ((double)mag / 1000.0) * ((double)convResolution/254000.0); ! return((long4) ((1.0/conv)+0.5)); } *************** *** 1951,1962 **** char spbuf[STRSIZE], xs[STRSIZE], ys[STRSIZE]; char *sf = NULL; float x,y; ! long x_pos, y_pos; KeyWord k; int i, j, j1; static int GrayScale=10, Pattern=1; static bool GrayFill=TRUE; ! static long p_x[80], p_y[80]; str[n] = '\0'; spbuf[0] = '\0'; --- 1951,1962 ---- char spbuf[STRSIZE], xs[STRSIZE], ys[STRSIZE]; char *sf = NULL; float x,y; ! long4 x_pos, y_pos; KeyWord k; int i, j, j1; static int GrayScale=10, Pattern=1; static bool GrayFill=TRUE; ! static long4 p_x[80], p_y[80]; str[n] = '\0'; spbuf[0] = '\0'; *************** *** 2039,2052 **** if (i>1) { #ifdef LJ SetPosn(p_x[j], p_y[j]); ! x_pos = (long)PIXROUND(p_x[j1]-p_x[j], hconv); ! y_pos = (long)PIXROUND(p_y[j1]-p_y[j], vconv); if (labs(x_pos)<labs(y_pos)) x_pos=x_pos+3; else y_pos=y_pos+3; if (GrayFill) { ! EMIT(outfp, "\033*c%lda%ldb%dg2P", x_pos, y_pos, GrayScale); } else { ! EMIT(outfp, "\033*c%lda%ldb%dg3P", x_pos, y_pos, Pattern); } last_ry = UNKNOWN; #endif --- 2039,2052 ---- if (i>1) { #ifdef LJ SetPosn(p_x[j], p_y[j]); ! x_pos = (long4)PIXROUND(p_x[j1]-p_x[j], hconv); ! y_pos = (long4)PIXROUND(p_y[j1]-p_y[j], vconv); if (labs(x_pos)<labs(y_pos)) x_pos=x_pos+3; else y_pos=y_pos+3; if (GrayFill) { ! EMIT(outfp, "\033*c%lda%ldb%dg2P", (long)x_pos, (long)y_pos, GrayScale); } else { ! EMIT(outfp, "\033*c%lda%ldb%dg3P", (long)x_pos, (long)y_pos, Pattern); } last_ry = UNKNOWN; #endif *************** *** 2093,2105 **** /**********************************************************************/ void /* output a character bitmap */ EmitChar(c, ce) ! long c; struct char_entry *ce; { register int i; register unsigned char *sl; unsigned short nbpl, nwpl; ! long total; #ifdef LJ unsigned char cnv_buffer[10]; #endif --- 2093,2105 ---- /**********************************************************************/ void /* output a character bitmap */ EmitChar(c, ce) ! long4 c; struct char_entry *ce; { register int i; register unsigned char *sl; unsigned short nbpl, nwpl; ! long4 total; #ifdef LJ unsigned char cnv_buffer[10]; #endif *************** *** 2168,2182 **** if (fontptr->id == pk89) { nwpl = 0; /* initialize variable */ nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long)ce->height * nbpl; } else if (fontptr->id == id1002) { nwpl = 0; /* initialize variable */ nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long)ce->height * nbpl; } else if (fontptr->id == id1001) { nwpl = ((int)(ce->width) + 31) >> 5; nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long)ce->height * nbpl; } else { /* should never be necessary */ nwpl = 0; --- 2168,2182 ---- if (fontptr->id == pk89) { nwpl = 0; /* initialize variable */ nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long4)ce->height * nbpl; } else if (fontptr->id == id1002) { nwpl = 0; /* initialize variable */ nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long4)ce->height * nbpl; } else if (fontptr->id == id1001) { nwpl = ((int)(ce->width) + 31) >> 5; nbpl = ((int)(ce->width) + 7) >> 3; ! total = (long4)ce->height * nbpl; } else { /* should never be necessary */ nwpl = 0; *************** *** 2189,2198 **** #endif /*************************************************************** if ( ((char) c == 'i') && (fontptr->plusid == 0)) { ! long j; ! fprintf(stderr, "cols=%ld, ncols=%ld\n",nwpl,nbpl); ! fprintf(stderr, "%ld Bytes:->",total); for (j=0; j<total;j++) { char *ch; char ic; ch = (char *)(ce->where.address.pixptr); --- 2189,2198 ---- #endif /*************************************************************** if ( ((char) c == 'i') && (fontptr->plusid == 0)) { ! long4 j; ! fprintf(stderr, "cols=%ld, ncols=%ld\n",(long)nwpl,(long)nbpl); ! fprintf(stderr, "%ld Bytes:->",(long)total); for (j=0; j<total;j++) { char *ch; char ic; ch = (char *)(ce->where.address.pixptr); *************** *** 2216,2222 **** #endif #endif ! /* ce->cw = (long)(((double)ce->tfmw / (double)hconv) +0.5); */ /* set active font to nn, load font pattern xx ... */ #ifdef IBM3812 PMPcont(total + 9); --- 2216,2222 ---- #endif #endif ! /* ce->cw = (long4)(((double)ce->tfmw / (double)hconv) +0.5); */ /* set active font to nn, load font pattern xx ... */ #ifdef IBM3812 PMPcont(total + 9); *************** *** 2285,2294 **** #endif #ifdef IBM3812 #ifdef USEPXL ! used_fontstorage += (long)ce->height * ((ce->width + 15) >> 4) *2 + 14; #else ! used_fontstorage += (long)num_rows * ((num_cols + 15) >> 4) *2 + 14; #endif #endif --- 2285,2294 ---- #endif #ifdef IBM3812 #ifdef USEPXL ! used_fontstorage += (long4)ce->height * ((ce->width + 15) >> 4) *2 + 14; #else ! used_fontstorage += (long4)num_rows * ((num_cols + 15) >> 4) *2 + 14; #endif #endif *************** *** 2315,2321 **** char *buffer; { #ifdef IBM3812 ! long total; static unsigned short maxlines; if (current_line == 0) { --- 2315,2321 ---- char *buffer; { #ifdef IBM3812 ! long4 total; static unsigned short maxlines; if (current_line == 0) { *************** *** 2339,2351 **** last_ry = UNKNOWN; /* next time full positioning */ } #ifdef USEPXL ! total = (long)(ce->height - current_line) * (long)nbpl; #else ! total = (long)(num_rows - current_line) * (long)nbpl; #endif if ((total + 9) > 65535) { maxlines = (unsigned short)((65535 - 9) / nbpl); ! total = (long)maxlines * (long)nbpl; } PMPcont(total + 9); --- 2339,2351 ---- last_ry = UNKNOWN; /* next time full positioning */ } #ifdef USEPXL ! total = (long4)(ce->height - current_line) * (long4)nbpl; #else ! total = (long4)(num_rows - current_line) * (long4)nbpl; #endif if ((total + 9) > 65535) { maxlines = (unsigned short)((65535 - 9) / nbpl); ! total = (long4)maxlines * (long4)nbpl; } PMPcont(total + 9); *************** *** 2441,2448 **** RasterLine(ce, (unsigned int)nbpl, i, sl); } } else if (fontptr->id == id1001) { ! long filediff; ! filediff = (long)nwpl * 4 - nbpl; for (i = 0; i < (int) ce->height; i++) { if (ce->charsize == HUGE_SIZE) { fread(raster_line_buf, 1, (int) nbpl, pxlfp); --- 2441,2448 ---- RasterLine(ce, (unsigned int)nbpl, i, sl); } } else if (fontptr->id == id1001) { ! long4 filediff; ! filediff = (long4)nwpl * 4 - nbpl; for (i = 0; i < (int) ce->height; i++) { if (ce->charsize == HUGE_SIZE) { fread(raster_line_buf, 1, (int) nbpl, pxlfp); *************** *** 2493,2503 **** /**********************************************************************/ void FindPostAmblePtr(postambleptr) ! long *postambleptr; /* this routine will move to the end of the file and find the start of the postamble */ { ! long i; fseek (dvifp, 0l, 2); /* goto end of file */ *postambleptr = ftell (dvifp) - 4; fseek (dvifp, *postambleptr, 0); --- 2493,2503 ---- /**********************************************************************/ void FindPostAmblePtr(postambleptr) ! long4 *postambleptr; /* this routine will move to the end of the file and find the start of the postamble */ { ! long4 i; fseek (dvifp, 0l, 2); /* goto end of file */ *postambleptr = ftell (dvifp) - 4; fseek (dvifp, *postambleptr, 0); *************** *** 2693,2704 **** /**********************************************************************/ /*************************** NoSignExtend ***************************/ /**********************************************************************/ ! long NoSignExtend(fp, n) /* return n byte quantity from file fd */ register FILE *fp; /* file pointer */ register int n; /* number of bytes */ { ! long x; /* number being constructed */ x = 0; while (n--) { x <<= 8; --- 2693,2704 ---- /**********************************************************************/ /*************************** NoSignExtend ***************************/ /**********************************************************************/ ! long4 NoSignExtend(fp, n) /* return n byte quantity from file fd */ register FILE *fp; /* file pointer */ register int n; /* number of bytes */ { ! long4 x; /* number being constructed */ x = 0; while (n--) { x <<= 8; *************** *** 2815,2824 **** /**********************************************************************/ /***************************** PixRound *****************************/ /**********************************************************************/ ! long PixRound(x, conv) /* return rounded number of pixels */ ! long x; /* in DVI units */ ! long conv; /* conversion factor */ { return((x + conv) / conv); } --- 2815,2824 ---- /**********************************************************************/ /***************************** PixRound *****************************/ /**********************************************************************/ ! long4 PixRound(x, conv) /* return rounded number of pixels */ ! long4 x; /* in DVI units */ ! long4 conv; /* conversion factor */ { return((x + conv) / conv); } *************** *** 2888,2894 **** #endif for (i = 0; i < NFNTCHARS; i++) { struct char_entry *cptr = &(fontptr->ch[i]); ! cptr->tfmw = (long) (tfm_info.widths[i] * factor); cptr->cw = ((fontptr->ch[i].tfmw) / (double) hconv) + .5; cptr->width = cptr->height = --- 2888,2894 ---- #endif for (i = 0; i < NFNTCHARS; i++) { struct char_entry *cptr = &(fontptr->ch[i]); ! cptr->tfmw = (long4) (tfm_info.widths[i] * factor); cptr->cw = ((fontptr->ch[i].tfmw) / (double) hconv) + .5; cptr->width = cptr->height = *************** *** 2921,2929 **** /**********************************************************************/ void ReadFontDef(k) ! long k; { ! long t; unsigned short i; struct font_entry *tfontptr; /* temporary font_entry pointer */ struct char_entry *tcharptr; /* temporary char_entry pointer */ --- 2921,2929 ---- /**********************************************************************/ void ReadFontDef(k) ! long4 k; { ! long4 t; unsigned short i; struct font_entry *tfontptr; /* temporary font_entry pointer */ struct char_entry *tcharptr; /* temporary char_entry pointer */ *************** *** 2966,2973 **** GetBytes(dvifp, tfontptr->n, tfontptr->a + tfontptr->l); tfontptr->n[tfontptr->a+tfontptr->l] = '\0'; ! tfontptr->font_mag = (long)(( ! ActualFactor((long)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)) * ActualFactor(mag) #ifdef USEPXL * RESOLUTION * 5.0 --- 2966,2973 ---- GetBytes(dvifp, tfontptr->n, tfontptr->a + tfontptr->l); tfontptr->n[tfontptr->a+tfontptr->l] = '\0'; ! tfontptr->font_mag = (long4)(( ! ActualFactor((long4)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)) * ActualFactor(mag) #ifdef USEPXL * RESOLUTION * 5.0 *************** *** 2978,2987 **** /* printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n", ((long)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)), ! ActualFactor((long)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)), ActualFactor(mag), (double)RESOLUTION * 5, ! tfontptr->font_mag ); */ #ifdef LJ_RESIDENT_FONTS --- 2978,2987 ---- /* printf("[%ld]=%lf * %lf * %lf + 0.5 = %ld\n", ((long)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)), ! ActualFactor((long4)(1000.0*tfontptr->s/(double)tfontptr->d+0.5)), ActualFactor(mag), (double)RESOLUTION * 5, ! (long)tfontptr->font_mag ); */ #ifdef LJ_RESIDENT_FONTS *************** *** 2996,3004 **** #endif { kpse_font_file_type font_ret; unsigned dpi = tfontptr->font_mag / 5.0 + .5; ! char *name = kpse_find_pk (tfontptr->n, dpi, &font_ret); if (name) { font_found = true; --- 2996,3006 ---- #endif { + char *name; kpse_font_file_type font_ret; unsigned dpi = tfontptr->font_mag / 5.0 + .5; ! kpse_set_maketex_mag(dpi, (int) (RESOLUTION + .5)); ! name = kpse_find_pk (tfontptr->n, dpi, &font_ret); if (name) { font_found = true; *************** *** 3050,3056 **** plusid++; /* sprintf(tfontptr->psname,"%s.%ld.%d", ! tfontptr->n,tfontptr->font_mag,tfontptr->plusid);*/ #ifdef LJ if (plusid >= HANDLE_MAX_FONTS) --- 3052,3058 ---- plusid++; /* sprintf(tfontptr->psname,"%s.%ld.%d", ! tfontptr->n,(long)tfontptr->font_mag,tfontptr->plusid);*/ #ifdef LJ if (plusid >= HANDLE_MAX_FONTS) *************** *** 3082,3091 **** #ifdef USEPXL return; } ! t = (long) NoSignExtend(pxlfp, 1); if (t == 0) { ! t = (long) NoSignExtend(pxlfp, 1); ! t = (long) NoSignExtend(pxlfp, 2); if (t == 1002) tfontptr->id = id1002; else if (t == 1001) --- 3084,3093 ---- #ifdef USEPXL return; } ! t = (long4) NoSignExtend(pxlfp, 1); if (t == 0) { ! t = (long4) NoSignExtend(pxlfp, 1); ! t = (long4) NoSignExtend(pxlfp, 2); if (t == 1002) tfontptr->id = id1002; else if (t == 1001) *************** *** 3131,3140 **** tcharptr->where.address.fileOffset = NoSignExtend(pxlfp,4) * 4; else tcharptr->where.address.fileOffset = NoSignExtend(pxlfp,4); ! tcharptr->tfmw = (long) ( (double)(NoSignExtend(pxlfp, 4)) * (double)tfontptr->s / (double) 0x100000 ); ! tcharptr->cw = (long)(((double)tcharptr->tfmw/(double)hconv) + 0.5); if (tcharptr->width > CHAR_WIDTH_LARGE || tcharptr->height > CHAR_HEIGTH_LARGE ) --- 3133,3142 ---- tcharptr->where.address.fileOffset = NoSignExtend(pxlfp,4) * 4; else tcharptr->where.address.fileOffset = NoSignExtend(pxlfp,4); ! tcharptr->tfmw = (long4) ( (double)(NoSignExtend(pxlfp, 4)) * (double)tfontptr->s / (double) 0x100000 ); ! tcharptr->cw = (long4)(((double)tcharptr->tfmw/(double)hconv) + 0.5); if (tcharptr->width > CHAR_WIDTH_LARGE || tcharptr->height > CHAR_HEIGTH_LARGE ) *************** *** 3158,3164 **** } else { /* PK 89 format */ unsigned char temp_byte; register unsigned char flag_byte; ! long hppp, vppp, pkloc, packet_length; int car, ii; /* read comment */ --- 3160,3166 ---- } else { /* PK 89 format */ unsigned char temp_byte; register unsigned char flag_byte; ! long4 hppp, vppp, pkloc, packet_length; int car, ii; /* read comment */ *************** *** 3183,3190 **** hppp = NoSignExtend(pxlfp, 4); vppp = NoSignExtend(pxlfp, 4); if (hppp != vppp) ! Warning("aspect ratio is %ld:%ld (should be 1:1)!", hppp,vppp); ! tfontptr->magnification = (long)(hppp * 72.27 * 5 / 65536l + 0.5); pkloc += 16; flag_byte = skip_specials(&pkloc); --- 3185,3192 ---- hppp = NoSignExtend(pxlfp, 4); vppp = NoSignExtend(pxlfp, 4); if (hppp != vppp) ! Warning("aspect ratio is %ld:%ld (should be 1:1)!", (long)hppp,(long)vppp); ! tfontptr->magnification = (long4)(hppp * 72.27 * 5 / 65536l + 0.5); pkloc += 16; flag_byte = skip_specials(&pkloc); *************** *** 3193,3199 **** if ((flag_byte & 7) == 7) { /* fprintf(stderr,"\nRead long character preamble\n"); */ ! packet_length = (unsigned long)NoSignExtend(pxlfp,4); if ((car = (int)NoSignExtend(pxlfp, 4)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; --- 3195,3201 ---- if ((flag_byte & 7) == 7) { /* fprintf(stderr,"\nRead long character preamble\n"); */ ! packet_length = (unsigned long4)NoSignExtend(pxlfp,4); if ((car = (int)NoSignExtend(pxlfp, 4)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; *************** *** 3202,3208 **** /* set pkloc to end_of_packet */ pkloc += packet_length + 8; ! tcharptr->tfmw = (long) NoSignExtend(pxlfp, 4); (void) NoSignExtend(pxlfp, 4); /* horesc not used */ (void) NoSignExtend(pxlfp, 4); /* not used */ --- 3204,3210 ---- /* set pkloc to end_of_packet */ pkloc += packet_length + 8; ! tcharptr->tfmw = (long4) NoSignExtend(pxlfp, 4); (void) NoSignExtend(pxlfp, 4); /* horesc not used */ (void) NoSignExtend(pxlfp, 4); /* not used */ *************** *** 3214,3220 **** } else if (flag_byte & 4) { /* fprintf(stderr,"Read extended short character preamble\n"); */ ! packet_length = ((long) flag_byte & 3) * 65536l + (unsigned short) NoSignExtend(pxlfp, 2); if ((car = (int)NoSignExtend(pxlfp, 1)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; --- 3216,3222 ---- } else if (flag_byte & 4) { /* fprintf(stderr,"Read extended short character preamble\n"); */ ! packet_length = ((long4) flag_byte & 3) * 65536l + (unsigned short) NoSignExtend(pxlfp, 2); if ((car = (int)NoSignExtend(pxlfp, 1)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; *************** *** 3224,3230 **** /* set pkloc to end_of_packet */ pkloc += packet_length + 3; ! tcharptr->tfmw = (long) NoSignExtend(pxlfp, 3); /* { register unsigned short t; t = (unsigned short) NoSignExtend(pxlfp, 1); --- 3226,3232 ---- /* set pkloc to end_of_packet */ pkloc += packet_length + 3; ! tcharptr->tfmw = (long4) NoSignExtend(pxlfp, 3); /* { register unsigned short t; t = (unsigned short) NoSignExtend(pxlfp, 1); *************** *** 3242,3248 **** } else { /* fprintf(stderr,"<Read short character preamble@>\n"); */ ! packet_length = ((long)flag_byte & 3) * 256 + NoSignExtend(pxlfp, 1) ; if ((car = (int)NoSignExtend(pxlfp, 1)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; --- 3244,3250 ---- } else { /* fprintf(stderr,"<Read short character preamble@>\n"); */ ! packet_length = ((long4)flag_byte & 3) * 256 + NoSignExtend(pxlfp, 1) ; if ((car = (int)NoSignExtend(pxlfp, 1)) > (LASTFNTCHAR)) Fatal("Bad character (%d) in PK-File\n",(int)car) ; *************** *** 3252,3258 **** /* set pkloc to end_of_packet */ pkloc += packet_length + 2 ; ! tcharptr->tfmw = (long) NoSignExtend(pxlfp, 3); /* { register unsigned short t; t = (unsigned short) NoSignExtend(pxlfp, 1); --- 3254,3260 ---- /* set pkloc to end_of_packet */ pkloc += packet_length + 2 ; ! tcharptr->tfmw = (long4) NoSignExtend(pxlfp, 3); /* { register unsigned short t; t = (unsigned short) NoSignExtend(pxlfp, 1); *************** *** 3269,3278 **** tcharptr ->where.isloaded = FALSE; } ! tcharptr->tfmw = (long) ( tcharptr->tfmw * (double)tfontptr->s / (double) 0x100000 ); ! tcharptr->cw = (long)(((double)tcharptr->tfmw / (double)hconv) + 0.5); if (tcharptr->width > CHAR_WIDTH_LARGE || --- 3271,3280 ---- tcharptr ->where.isloaded = FALSE; } ! tcharptr->tfmw = (long4) ( tcharptr->tfmw * (double)tfontptr->s / (double) 0x100000 ); ! tcharptr->cw = (long4)(((double)tcharptr->tfmw / (double)hconv) + 0.5); if (tcharptr->width > CHAR_WIDTH_LARGE || *************** *** 3329,3336 **** for(i=FIRSTFNTCHAR; i<=LASTFNTCHAR; i++) { if (char_exists[i]) { tcharptr = &(tfontptr->ch[i]); ! tcharptr->tfmw = (long)(((float)tfm_wd[i]*(float)tfontptr->s) / ! (float)((long)1l<<20)); tcharptr->where.address.fileOffset = char_pointer[i]; } #ifdef LJ --- 3331,3338 ---- for(i=FIRSTFNTCHAR; i<=LASTFNTCHAR; i++) { if (char_exists[i]) { tcharptr = &(tfontptr->ch[i]); ! tcharptr->tfmw = (long4)(((float)tfm_wd[i]*(float)tfontptr->s) / ! (float)((long4)1l<<20)); tcharptr->where.address.fileOffset = char_pointer[i]; } #ifdef LJ *************** *** 3346,3352 **** fprintf(stderr,"%d:\t <%c> w=%d h=%d xO=%d yO=%d tfmw=%ld cw=%ld %d\n", i,(char) i, tcharptr->width,tcharptr->height,tcharptr->xOffset,tcharptr->yOffset, ! tcharptr->tfmw, tcharptr->cw, (int)(tcharptr->charsize)); */ /*****************************************************************************/ } --- 3348,3354 ---- fprintf(stderr,"%d:\t <%c> w=%d h=%d xO=%d yO=%d tfmw=%ld cw=%ld %d\n", i,(char) i, tcharptr->width,tcharptr->height,tcharptr->xOffset,tcharptr->yOffset, ! (long)tcharptr->tfmw, (long)tcharptr->cw, (int)(tcharptr->charsize)); */ /*****************************************************************************/ } *************** *** 3355,3368 **** unsigned char skip_specials( pkloc ) ! long *pkloc; { ! long i, j; register unsigned char flag_byte; do { flag_byte = (unsigned char) NoSignExtend(pxlfp, 1); /* ! fprintf(stderr,"flagbyte = %d, pkloc=%ld\n",(int)flag_byte,*pkloc); */ (*pkloc) ++; --- 3357,3370 ---- unsigned char skip_specials( pkloc ) ! long4 *pkloc; { ! long4 i, j; register unsigned char flag_byte; do { flag_byte = (unsigned char) NoSignExtend(pxlfp, 1); /* ! fprintf(stderr,"flagbyte = %d, pkloc=%ld\n",(int)flag_byte,(long)*pkloc); */ (*pkloc) ++; *************** *** 3373,3379 **** case 242: case 243 : { i = 0 ; ! for (j = 240; j <= (long)flag_byte; j++) { i = 256 * i + NoSignExtend(pxlfp, 1) ; (*pkloc) ++; } --- 3375,3381 ---- case 242: case 243 : { i = 0 ; ! for (j = 240; j <= (long4)flag_byte; j++) { i = 256 * i + NoSignExtend(pxlfp, 1) ; (*pkloc) ++; } *************** *** 3436,3442 **** mag = NoSignExtend(dvifp, 4); if ( usermag > 0 && usermag != mag ) Warning("DVI magnification of %ld over-ridden by user (%ld)", ! mag, usermag ); if ( usermag > 0 ) mag = usermag; hconv = DoConv(num, den, hconvRESOLUTION); --- 3438,3444 ---- mag = NoSignExtend(dvifp, 4); if ( usermag > 0 && usermag != mag ) Warning("DVI magnification of %ld over-ridden by user (%ld)", ! (long)mag, (long)usermag ); if ( usermag > 0 ) mag = usermag; hconv = DoConv(num, den, hconvRESOLUTION); *************** *** 3462,3472 **** /**********************************************************************/ void LoadAChar(c, ptr) ! long c; register struct char_entry *ptr; { ! long *pr; ! long bytes; if (ptr->where.address.fileOffset == NONEXISTANT #ifdef LJ_RESIDENT_FONTS --- 3464,3474 ---- /**********************************************************************/ void LoadAChar(c, ptr) ! long4 c; register struct char_entry *ptr; { ! long4 *pr; ! long4 bytes; if (ptr->where.address.fileOffset == NONEXISTANT #ifdef LJ_RESIDENT_FONTS *************** *** 3482,3488 **** #ifdef DEBUG if (Debug) fprintf(stderr, "LoadAChar: <%c>(%ld) from file at pos %ld\n", ! (char)c,c,ptr->where.address.fileOffset); #endif #ifdef USEPXL --- 3484,3490 ---- #ifdef DEBUG if (Debug) fprintf(stderr, "LoadAChar: <%c>(%ld) from file at pos %ld\n", ! (char)c,(long)c,(long)ptr->where.address.fileOffset); #endif #ifdef USEPXL *************** *** 3502,3526 **** #endif if ((ptr->flag_byte & 7) == 7) { ! bytes = ((long) NoSignExtend(pxlfp, 4)) - 28; fseek(pxlfp, ptr->where.address.fileOffset + 36, 0); /* ! fprintf(stderr,"bytes=%d, seeking at %ld\n", ! bytes, ptr->where.address.fileOffset + 36); */ } else if ((ptr->flag_byte & 4) == 4) { ! bytes = ((long)ptr->flag_byte & 3) * 65536l + NoSignExtend(pxlfp, 2) - 13; fseek(pxlfp, ptr->where.address.fileOffset + 16, 0); } else { ! bytes = ((long)ptr->flag_byte & 3) * 256 + NoSignExtend(pxlfp, 1) - 8; fseek(pxlfp, ptr->where.address.fileOffset + 10, 0); } } else if (fontptr->id == id1002) ! bytes = ((( (long)ptr->width + 7) >> 3) * (long) ptr->height); else if (fontptr->id == id1001) ! bytes = 4 * (((long)ptr->width + 31) >> 5) * (long)ptr->height; else bytes = 0; --- 3504,3528 ---- #endif if ((ptr->flag_byte & 7) == 7) { ! bytes = ((long4) NoSignExtend(pxlfp, 4)) - 28; fseek(pxlfp, ptr->where.address.fileOffset + 36, 0); /* ! fprintf(stderr,"bytes=%ld, seeking at %ld\n", ! (long)bytes, (long)ptr->where.address.fileOffset + 36); */ } else if ((ptr->flag_byte & 4) == 4) { ! bytes = ((long4)ptr->flag_byte & 3) * 65536l + NoSignExtend(pxlfp, 2) - 13; fseek(pxlfp, ptr->where.address.fileOffset + 16, 0); } else { ! bytes = ((long4)ptr->flag_byte & 3) * 256 + NoSignExtend(pxlfp, 1) - 8; fseek(pxlfp, ptr->where.address.fileOffset + 10, 0); } } else if (fontptr->id == id1002) ! bytes = ((( (long4)ptr->width + 7) >> 3) * (long4) ptr->height); else if (fontptr->id == id1001) ! bytes = 4 * (((long4)ptr->width + 31) >> 5) * (long4)ptr->height; else bytes = 0; *************** *** 3527,3548 **** if (bytes > 0) { /* do NOT load Huge characters */ if ((bytes > HUGE_CHAR_PATTERN) && (fontptr->id != pk89)) { ! qfprintf(stderr,"Huge Character <%c> (%ld Bytes)\n", (char)c, bytes); ptr->charsize = HUGE_SIZE; ptr->where.isloaded = FALSE; } else { ! if ( (pr = (long *)malloc( bytes )) == NULL ) Fatal("Unable to allocate %ld bytes for char <%c>\n", ! bytes, (char)c); /* * else fprintf(stderr,"allocating %ld bytes char <%c>(%d)\t at 0x%lx\n", ! * bytes, (char)c,(int)c,pr); */ #ifdef DEBUG if (Debug) fprintf(stderr, "Allocating Char <%c>, FileOffset=%lX, Bytes=%ld (%d) <%d>\n", ! (char) c, ptr->where.address.fileOffset, bytes, (int)bytes, (unsigned int)bytes); #endif allocated_storage += bytes; --- 3529,3550 ---- if (bytes > 0) { /* do NOT load Huge characters */ if ((bytes > HUGE_CHAR_PATTERN) && (fontptr->id != pk89)) { ! qfprintf(stderr,"Huge Character <%c> (%ld Bytes)\n", (char)c, (long)bytes); ptr->charsize = HUGE_SIZE; ptr->where.isloaded = FALSE; } else { ! if ( (pr = (long4 *)malloc( bytes )) == NULL ) Fatal("Unable to allocate %ld bytes for char <%c>\n", ! (long)bytes, (char)c); /* * else fprintf(stderr,"allocating %ld bytes char <%c>(%d)\t at 0x%lx\n", ! * (long)bytes, (char)c,(int)c,(long)pr); */ #ifdef DEBUG if (Debug) fprintf(stderr, "Allocating Char <%c>, FileOffset=%lX, Bytes=%ld (%d) <%d>\n", ! (char) c, (long)ptr->where.address.fileOffset, (long)bytes, (int)bytes, (unsigned int)bytes); #endif allocated_storage += bytes; *************** *** 3584,3590 **** /**********************************************************************/ void SetChar(c, command, PassNo, do_posn,in_string) ! long c; short command; int PassNo; bool do_posn,in_string; --- 3586,3592 ---- /**********************************************************************/ void SetChar(c, command, PassNo, do_posn,in_string) ! long4 c; short command; int PassNo; bool do_posn,in_string; *************** *** 3610,3619 **** /* printf("(%d) hh=%ld (+%ld/+%ld), h=%ld, xh=%ld,xhh=%ld, [%ld|%ld] ->%d\n", ! (int)do_posn,hh,(long)ptr->cw,(long)ptr->cw*(long)hconv,h, ! PIXROUND(h, hconv), ! PIXROUND(hh, hconv), ! labs((hh-h)),hconv,(labs((hh-h))>hconv) ); */ --- 3612,3621 ---- /* printf("(%d) hh=%ld (+%ld/+%ld), h=%ld, xh=%ld,xhh=%ld, [%ld|%ld] ->%d\n", ! (int)do_posn,(long)hh,(long)ptr->cw,(long)ptr->cw*(long)hconv,(long)h, ! (long)PIXROUND(h, hconv), ! (long)PIXROUND(hh, hconv), ! (long)labs((hh-h)),(long)hconv,(labs((hh-h))>hconv) ); */ *************** *** 3735,3741 **** { TRANSPARENTCHAR(cc);} #endif } ! hh += (long) ptr->cw*hconv; } if (command <= SET4) h += ptr->tfmw; --- 3737,3743 ---- { TRANSPARENTCHAR(cc);} #endif } ! hh += (long4) ptr->cw*hconv; } if (command <= SET4) h += ptr->tfmw; *************** *** 3769,3775 **** /**********************************************************************/ void SetFntNum(k, Emitting) ! long k; bool Emitting; /* this routine is used to specify the font to be used in printing future characters */ --- 3771,3777 ---- /**********************************************************************/ void SetFntNum(k, Emitting) ! long4 k; bool Emitting; /* this routine is used to specify the font to be used in printing future characters */ *************** *** 3781,3787 **** while ((fontptr != NULL) && (fontptr->k != k)) fontptr = fontptr->next; if (fontptr == NULL) ! Fatal("font %ld undefined", k); if (Emitting && fontptr->font_file_id != NO_FILE) { if (!fontptr->used_on_this_page #ifdef LJ_RESIDENT_FONTS --- 3783,3789 ---- while ((fontptr != NULL) && (fontptr->k != k)) fontptr = fontptr->next; if (fontptr == NULL) ! Fatal("font %ld undefined", (long)k); if (Emitting && fontptr->font_file_id != NO_FILE) { if (!fontptr->used_on_this_page #ifdef LJ_RESIDENT_FONTS *************** *** 3862,3868 **** /**********************************************************************/ void /* output a positioning command */ SetPosn(x, y) ! long x, y; { int rx, ry; rx = (int)PIXROUND(x, hconv) + x_goffset; --- 3864,3870 ---- /**********************************************************************/ void /* output a positioning command */ SetPosn(x, y) ! long4 x, y; { int rx, ry; rx = (int)PIXROUND(x, hconv) + x_goffset; *************** *** 3869,3875 **** ry = (int)PIXROUND(y, vconv) + y_goffset; /* ! * fprintf(stderr,"setposn to %ld/%ld, %d/%d\n",x,y,rx,ry); */ #ifdef IBM3812 --- 3871,3877 ---- ry = (int)PIXROUND(y, vconv) + y_goffset; /* ! * fprintf(stderr,"setposn to %ld/%ld, %d/%d\n",(long)x,(long)y,rx,ry); */ #ifdef IBM3812 *************** *** 3902,3908 **** vv = y; /* * fprintf(stderr,"DoPosn: x=%ld, y=%ld, rx=%d, ry=%d, hh=%ld, vv=%ld\n", ! * x,y,rx,ry,hh,vv); */ } --- 3904,3910 ---- vv = y; /* * fprintf(stderr,"DoPosn: x=%ld, y=%ld, rx=%d, ry=%d, hh=%ld, vv=%ld\n", ! * (long)x,(long)y,rx,ry,(long)hh,(long)vv); */ } *************** *** 3962,3982 **** /**********************************************************************/ void /* this routine will draw a rule */ SetRule(a, b, Set) ! long a, b; int Set; { ! long xx, yy; #ifdef IBM3812 short hor_offset, vert_offset, ll; #endif if ( a > 0 && b > 0 ) { SetPosn(h, v); /* lower left corner */ ! xx = (long)PIXROUND(b, hconv); /* width */ ! yy = (long)PIXROUND(a, vconv); /* height */ #ifdef DEBUG if (Debug) ! fprintf(stderr,"Rule xx=%ld, yy=%ld\n", xx, yy); #endif #ifdef IBM3812 --- 3964,3984 ---- /**********************************************************************/ void /* this routine will draw a rule */ SetRule(a, b, Set) ! long4 a, b; int Set; { ! long4 xx, yy; #ifdef IBM3812 short hor_offset, vert_offset, ll; #endif if ( a > 0 && b > 0 ) { SetPosn(h, v); /* lower left corner */ ! xx = (long4)PIXROUND(b, hconv); /* width */ ! yy = (long4)PIXROUND(a, vconv); /* height */ #ifdef DEBUG if (Debug) ! fprintf(stderr,"Rule xx=%ld, yy=%ld\n", (long)xx, (long)yy); #endif #ifdef IBM3812 *************** *** 4058,4064 **** hor_offset = -(ll + hor_offset); vert_offset = (y0 - vert_offset); ! yy -= (long)y0; hor_offset += HOR_HALF(yy); MoveHor(hor_offset); vert_offset += VERT_HALF(yy); --- 4060,4066 ---- hor_offset = -(ll + hor_offset); vert_offset = (y0 - vert_offset); ! yy -= (long4)y0; hor_offset += HOR_HALF(yy); MoveHor(hor_offset); vert_offset += VERT_HALF(yy); *************** *** 4072,4081 **** if (last_rx < 0) xx += last_rx; if (((int)pgsiz_dots >0) && ((int)last_ry > (int)pgsiz_dots)) ! yy += (long)pgsiz_dots - (long)last_ry; if ((yy>0) && (xx>0)) ! EMIT(outfp, "\033*p-%ldY\033*c%lda%ldbP", yy - 1, xx, yy); #endif last_ry = UNKNOWN; /* next time full positioning */ } --- 4074,4083 ---- if (last_rx < 0) xx += last_rx; if (((int)pgsiz_dots >0) && ((int)last_ry > (int)pgsiz_dots)) ! yy += (long4)pgsiz_dots - (long4)last_ry; if ((yy>0) && (xx>0)) ! EMIT(outfp, "\033*p-%ldY\033*c%lda%ldbP", (long)yy - 1, (long)xx, (long)yy); #endif last_ry = UNKNOWN; /* next time full positioning */ } *************** *** 4105,4111 **** if (Debug) fprintf(stderr, "%d(%c) ", c, c); #endif ! SetChar((long)c, c, PassNo, (bool)(i==0),TRUE); c = (short) NoSignExtend(dvifp, 1); } fseek(dvifp, -1l, 1); /* backup one character */ --- 4107,4113 ---- if (Debug) fprintf(stderr, "%d(%c) ", c, c); #endif ! SetChar((long4)c, c, PassNo, (bool)(i==0),TRUE); c = (short) NoSignExtend(dvifp, 1); } fseek(dvifp, -1l, 1); /* backup one character */ *************** *** 4119,4126 **** } #ifndef ARITHMETIC_RIGHT_SHIFT ! long signTab[5] = {0,0x00000080,0x00008000,0x00800000,0x00000000}; ! long extendTab[5] = {0,~0^0xff,~0^0xffff,~0^0xffffff,~0^0xffffffff}; #endif /*-->SignExtend*/ --- 4121,4128 ---- } #ifndef ARITHMETIC_RIGHT_SHIFT ! long4 signTab[5] = {0,0x00000080,0x00008000,0x00800000,0x00000000}; ! long4 extendTab[5] = {0,~0^0xff,~0^0xffff,~0^0xffffff,~0^0xffffffff}; #endif /*-->SignExtend*/ *************** *** 4127,4141 **** /**********************************************************************/ /**************************** SignExtend ****************************/ /**********************************************************************/ ! long SignExtend(fp, n) /* return n byte quantity from file fd */ register FILE *fp; /* file pointer */ register int n; /* number of bytes */ { int n1; /* number of bytes */ ! long x; /* number being constructed */ #ifdef SIGN_DEBUG ! long x0; /* copy of x */ #endif x = getc(fp); /* get first (high-order) byte */ n1 = n--; --- 4129,4143 ---- /**********************************************************************/ /**************************** SignExtend ****************************/ /**********************************************************************/ ! long4 SignExtend(fp, n) /* return n byte quantity from file fd */ register FILE *fp; /* file pointer */ register int n; /* number of bytes */ { int n1; /* number of bytes */ ! long4 x; /* number being constructed */ #ifdef SIGN_DEBUG ! long4 x0; /* copy of x */ #endif x = getc(fp); /* get first (high-order) byte */ n1 = n--; *************** *** 4250,4256 **** { static char buffer[OUTBUFSIZE]; static unsigned short bp = 0; /* range 0..OUTBUFSIZE */ ! static long continuous = 0l; static bool buffered = TRUE; if (l == 0) { --- 4252,4258 ---- { static char buffer[OUTBUFSIZE]; static unsigned short bp = 0; /* range 0..OUTBUFSIZE */ ! static long4 continuous = 0l; static bool buffered = TRUE; if (l == 0) { *************** *** 4263,4272 **** return; } if (l == -1) { ! continuous = (long)s; ! if (continuous + (long)bp + 5l > (long) OUTBUFSIZE) PMPflush; ! buffered = (bool) ((continuous + 5l <= (long) OUTBUFSIZE)); if (!buffered) { EMIT(outfp, "\033[C%c%c", (unsigned char)(continuous & 0xFF), --- 4265,4274 ---- return; } if (l == -1) { ! continuous = (long4)s; ! if (continuous + (long4)bp + 5l > (long4) OUTBUFSIZE) PMPflush; ! buffered = (bool) ((continuous + 5l <= (long4) OUTBUFSIZE)); if (!buffered) { EMIT(outfp, "\033[C%c%c", (unsigned char)(continuous & 0xFF), *************** *** 4276,4282 **** } if (buffered) { register int i; ! if ( ((long)l + bp) > OUTBUFSIZE) PMPflush; for (i = 0; i < l; i++) buffer[bp+i] = s[i]; --- 4278,4284 ---- } if (buffered) { register int i; ! if ( ((long4)l + bp) > OUTBUFSIZE) PMPflush; for (i = 0; i < l; i++) buffer[bp+i] = s[i]; *************** *** 4283,4289 **** bp += (unsigned short)l; } else { EMITB((int)l, s); ! buffered = (bool) ((continuous -= (long)l) <= 0) ; } } --- 4285,4291 ---- bp += (unsigned short)l; } else { EMITB((int)l, s); ! buffered = (bool) ((continuous -= (long4)l) <= 0) ; } } *************** *** 4340,4346 **** #ifdef USEPXL bool getbit (); unsigned char getnyb (); ! long pk_packed_num (); #define PKBYTE *pkloc; pkloc ++ --- 4342,4348 ---- #ifdef USEPXL bool getbit (); unsigned char getnyb (); ! long4 pk_packed_num (); #define PKBYTE *pkloc; pkloc ++ *************** *** 4361,4368 **** int wordwidth ; bool turnon; unsigned short nbpl; ! long rowsleft, word, wordweight, hbit, count, i, j, tl; ! long row[101] ; unsigned char raster_line_buf[BYTES_PER_PIXEL_LINE]; unsigned short bp; --- 4363,4370 ---- int wordwidth ; bool turnon; unsigned short nbpl; ! long4 rowsleft, word, wordweight, hbit, count, i, j, tl; ! long4 row[101] ; unsigned char raster_line_buf[BYTES_PER_PIXEL_LINE]; unsigned short bp; *************** *** 4381,4387 **** bitweight = 0 ; if (dyn_f == 14) { /*printf("<Get raster by bits@>\n");*/ ! for (i = 1; i <= (long)ce->height; i++) { word = 0 ; wordweight = 31 ; bp = 0; /* Sowa */ --- 4383,4389 ---- bitweight = 0 ; if (dyn_f == 14) { /*printf("<Get raster by bits@>\n");*/ ! for (i = 1; i <= (long4)ce->height; i++) { word = 0 ; wordweight = 31 ; bp = 0; /* Sowa */ *************** *** 4389,4395 **** #ifdef DRAWGLYPH printf(" |"); #endif ! for (j = 1; j <= (long) ce->width; j++) { bool getbit; /* bp = 0; SOWA */ /*******************************************begin Getbit *********/ --- 4391,4397 ---- #ifdef DRAWGLYPH printf(" |"); #endif ! for (j = 1; j <= (long4) ce->width; j++) { bool getbit; /* bp = 0; SOWA */ /*******************************************begin Getbit *********/ *************** *** 4441,4447 **** #endif #endif ! for (j = 3; j >= (wordwidth * 4 - (long)nbpl); j--) { OUTCHAR(((word >> (j << 3)) & 0xff)); --- 4443,4449 ---- #endif #endif ! for (j = 3; j >= (wordwidth * 4 - (long4)nbpl); j--) { OUTCHAR(((word >> (j << 3)) & 0xff)); *************** *** 4471,4478 **** } } else { /* fprintf(stderr, "@<Create normally packed raster@>\n"); */ ! rowsleft = (long) ce->height ; ! hbit = (long) ce->width ; repeatcount = 0 ; wordweight = 32 ; word = 0 ; --- 4473,4480 ---- } } else { /* fprintf(stderr, "@<Create normally packed raster@>\n"); */ ! rowsleft = (long4) ce->height ; ! hbit = (long4) ce->width ; repeatcount = 0 ; wordweight = 32 ; word = 0 ; *************** *** 4502,4508 **** row[rp] = word ; /*fprintf(stderr, " @<Send row@> \n");*/ ! for (i = 0; i <= (long) repeatcount; i++) { int ii; #ifdef DRAWGLYPH printf("*** |"); --- 4504,4510 ---- row[rp] = word ; /*fprintf(stderr, " @<Send row@> \n");*/ ! for (i = 0; i <= (long4) repeatcount; i++) { int ii; #ifdef DRAWGLYPH printf("*** |"); *************** *** 4525,4531 **** #endif } tl = row[wordwidth]; ! for (j = 3; j >= (wordwidth *4 - (long)nbpl); j--) { OUTCHAR(((tl >> (j << 3)) & 0xff)); --- 4527,4533 ---- #endif } tl = row[wordwidth]; ! for (j = 3; j >= (wordwidth *4 - (long4)nbpl); j--) { OUTCHAR(((tl >> (j << 3)) & 0xff)); *************** *** 4553,4570 **** #ifdef DRAWGLYPH printf("| "); ! for (j=1;j<=(long)wordwidth;j++) printf("%02lX/",row[j]); printf(" raster=%d\n",raster); #endif } ! rowsleft -= (long)repeatcount + 1 ; repeatcount = 0 ; rp = 1 ; word = 0 ; wordweight = 32 ; count -= hbit ; ! hbit = (long)ce->width ; } else { if (turnon) word += gpower[wordweight] ; row[rp] = word ; --- 4555,4572 ---- #ifdef DRAWGLYPH printf("| "); ! for (j=1;j<=(long4)wordwidth;j++) printf("%02lX/",row[j]); printf(" raster=%d\n",raster); #endif } ! rowsleft -= (long4)repeatcount + 1 ; repeatcount = 0 ; rp = 1 ; word = 0 ; wordweight = 32 ; count -= hbit ; ! hbit = (long4)ce->width ; } else { if (turnon) word += gpower[wordweight] ; row[rp] = word ; *************** *** 4580,4586 **** else turnon = TRUE; } /* ...... rowsleft > 0 */ ! if ((rowsleft != 0) || (hbit != (long)ce->width)) Fatal("Bad pk file----more bits than required!\n"); } /* .... create normally packed raster */ } --- 4582,4588 ---- else turnon = TRUE; } /* ...... rowsleft > 0 */ ! if ((rowsleft != 0) || (hbit != (long4)ce->width)) Fatal("Bad pk file----more bits than required!\n"); } /* .... create normally packed raster */ } *************** *** 4600,4626 **** } ! long pk_packed_num () { /*@<Packed number procedure@>= */ register int i; ! long j; i = (int)getnyb(); if (i == 0) { do { ! j = (long)getnyb(); i++; } while (j == 0) ; while (i > 0) { ! j = j * 16 + (long)getnyb() ; i--; }; return (j - 15 + (13 - dyn_f) * 16 + dyn_f) ; } else if (i <= (int)dyn_f) { ! return ((long)i); } else if (i < 14) { ! return ((i-(long)dyn_f - 1) * 16 + (long)getnyb() + dyn_f + 1); } else { if (i == 14) { repeatcount = (int) pk_packed_num() ; --- 4602,4628 ---- } ! long4 pk_packed_num () { /*@<Packed number procedure@>= */ register int i; ! long4 j; i = (int)getnyb(); if (i == 0) { do { ! j = (long4)getnyb(); i++; } while (j == 0) ; while (i > 0) { ! j = j * 16 + (long4)getnyb() ; i--; }; return (j - 15 + (13 - dyn_f) * 16 + dyn_f) ; } else if (i <= (int)dyn_f) { ! return ((long4)i); } else if (i < 14) { ! return ((i-(long4)dyn_f - 1) * 16 + (long4)getnyb() + dyn_f + 1); } else { if (i == 14) { repeatcount = (int) pk_packed_num() ; *** dvilj.1.orig Wed Mar 2 16:37:09 1994 --- dvilj.1 Fri Apr 1 18:02:36 1994 *************** *** 1,8 **** .TH DVILJK 1 "2 March 1994" .ad b .SH NAME ! dvilj2, dvilj2p, dvilj, dviljp, dvi3812 \- convert dvi files to HP ! LaserJet or IBM 3812 format .SH SYNOPSIS \f3dvi2lj\f1 [\f3-a\f2fontpath\f1] [\f3-b \f1] --- 1,8 ---- .TH DVILJK 1 "2 March 1994" .ad b .SH NAME ! dvilj4, dvilj2p, dvilj \- convert dvi files to HP ! LaserJet format .SH SYNOPSIS \f3dvi2lj\f1 [\f3-a\f2fontpath\f1] [\f3-b \f1] *************** *** 31,37 **** [\f3-z\f1] [\f2filename\f1] .SH DESCRIPTION ! Dvilj2 converts TeX-output .dvi files into HP PCL (i.e. HP Printer Control Language) commands suitable for printing on a HP LaserJet+, HP LaserJet II and fully compatible printers. .br --- 31,37 ---- [\f3-z\f1] [\f2filename\f1] .SH DESCRIPTION ! Dvilj converts TeX-output .dvi files into HP PCL (i.e. HP Printer Control Language) commands suitable for printing on a HP LaserJet+, HP LaserJet II and fully compatible printers. .br *************** *** 40,49 **** and fully compatible printers. This version uses a newer PCL command set and provides landscape printing. .br - Dviljp and dvilj are similar to dvilj2p and dvilj2 but they support - only 128 character fonts. They may be used for Laserjet clones which do - not support 256 character fonts. - .br Dvilj4 is for the HP LasterJet IV printer familiy and fully compatible clones. It implements a superset of the commands available for dvilj2p and prints with an resolution of 600 dpi. In addition it provides support --- 40,45 ---- *************** *** 55,72 **** fonts that come with the distribution in the plain-compatible or Cork-compatible encodings). .br - Dvi3812 converts TeX-output .dvi files into PMP files, - the native command language of the IBM 3812 page printer. - .br All programs are generated from the same source dvi2xx.c. They are usually called by a shell script or as a line printer filter. .SH OPTIONS .TP - \f3-b\f1 - .br - take paper for first page from alternate cassette (only 3812) - .TP \f3-c\f2number\f1 print each page \f2number\f1 times (including original) .TP --- 51,61 ---- *************** *** 86,93 **** Switch printer into econo mode (dvilj4 only) .TP \f3-e\f2output file\f1 ! default output filename is the basename of dvi file and extension '.lj' ! for laserjet and '.pmp' for 3812. The '-e' option can be used to override this default and to direct the output to a different file. If the output filename is set to '-` (option '-e-') the output is directed to stdout and can be directly piped into a spooler. --- 75,82 ---- Switch printer into econo mode (dvilj4 only) .TP \f3-e\f2output file\f1 ! default output filename is the basename of dvi file and extension '.lj'. ! The '-e' option can be used to override this default and to direct the output to a different file. If the output filename is set to '-` (option '-e-') the output is directed to stdout and can be directly piped into a spooler. *************** *** 106,112 **** \f3-l\f1 .br landscape - print output in landscape mode. This option is provided ! only for dvilj2p, dvilj4 and dvi3812. .TP \f3-M\f2flag\f1 Do not call MakeTeXPK. \f3-M\f21\f1 and \f3-M\f1 are equivalent, --- 95,101 ---- \f3-l\f1 .br landscape - print output in landscape mode. This option is provided ! only for dvilj2p and dvilj4. .TP \f3-M\f2flag\f1 Do not call MakeTeXPK. \f3-M\f21\f1 and \f3-M\f1 are equivalent, *************** *** 145,154 **** \f3-r\f1 .br toggle reverse/not reverse order for output. ! By default reverse=FALSE for 3812, reverse=TRUE for laserjet. .TP \f3-s\f2pagesize \f1 ! Spezify pagesize (LJ-family only!) .br \f3-s1\f1: executive (7.25in * 10.5in) .br --- 134,143 ---- \f3-r\f1 .br toggle reverse/not reverse order for output. ! By default reverse=TRUE. .TP \f3-s\f2pagesize \f1 ! Spezify pagesize .br \f3-s1\f1: executive (7.25in * 10.5in) .br *************** *** 200,206 **** \f3-z\f1 .br print a test page with the page counter at end of job - (only for laserjet) .TP .br If no arguments are specified a short help file is displayed. --- 189,194 ---- *************** *** 210,221 **** .TP \f3\especial{file=<filename>}\f1 copy specified file to the printer; either vector- or bitmap-graphics PMP ! commands (for laserjet and 3812) ! .TP ! \f3\especial{orientation=<value>}\f1 ! set page orientation to 0, 1, 2, 3; ! rotate following output to landscape mode etc. ! (3812 only). .TP 0 others: There are a few other special commands implented for the LJ-series, --- 198,204 ---- .TP \f3\especial{file=<filename>}\f1 copy specified file to the printer; either vector- or bitmap-graphics PMP ! commands .TP 0 others: There are a few other special commands implented for the LJ-series, *************** *** 231,241 **** without the optional \f21\f1 or \f22\f1) the following will happen after half of the pages is printed: - .TP 6 - \f33812: \f1 - the printer beeps, shows message U1. An operator - has to refill the printed pages into the paper tray and to - push the continue button on the printer. .TP \f3LJ:\f1 the printer stops, shows message "FEED" and switches --- 214,219 ---- *** tfm.c.orig Thu Mar 3 05:42:58 1994 --- tfm.c Sat Apr 2 11:53:39 1994 *************** *** 12,18 **** /* Defined in dvi2xx.c. */ ! extern long NoSignExtend (); #define TFM_GET_TWO() NoSignExtend (tfm_fp, 2) #define TFM_GET_FOUR() NoSignExtend (tfm_fp, 4) --- 12,18 ---- /* Defined in dvi2xx.c. */ ! extern long4 NoSignExtend (); #define TFM_GET_TWO() NoSignExtend (tfm_fp, 2) #define TFM_GET_FOUR() NoSignExtend (tfm_fp, 4) *************** *** 121,127 **** FILE *tfm_fp; unsigned char *header_data; unsigned char *width_raw; /* array of 1-byte data */ ! unsigned long *width_table; /* array of 4-byte fixes */ unsigned i; unsigned lh, bc, ec, nw, nh, nd, ni, nl, nk, ne, np; char *full_name = kpse_find_tfm (name); --- 121,127 ---- FILE *tfm_fp; unsigned char *header_data; unsigned char *width_raw; /* array of 1-byte data */ ! unsigned long4 *width_table; /* array of 4-byte fixes */ unsigned i; unsigned lh, bc, ec, nw, nh, nd, ni, nl, nk, ne, np; char *full_name = kpse_find_tfm (name); *************** *** 186,192 **** /* The width table is just nw words. */ tfm_get_n (tfm_fp, nw, &width_raw); ! width_table = (unsigned long *) xmalloc (nw * 4); /* But the width table contains four-byte numbers, so have to convert from BigEndian to host order. */ --- 186,192 ---- /* The width table is just nw words. */ tfm_get_n (tfm_fp, nw, &width_raw); ! width_table = (unsigned long4 *) xmalloc (nw * 4); /* But the width table contains four-byte numbers, so have to convert from BigEndian to host order. */